Autogenerated HTML docs for v1.6.6-rc0-50-gaf06e
diff --git a/git-config.html b/git-config.html index ae83f25..4defb99 100644 --- a/git-config.html +++ b/git-config.html
@@ -905,6 +905,16 @@ when writing commit messages. Default: true. </p> </dd> +<dt> +commitBeforeMerge +</dt> +<dd> +<p> + Advice shown when <a href="git-merge.html">git-merge(1)</a> refuses to + merge to avoid overwritting local changes. + Default: true. +</p> +</dd> </dl></div> </dd> <dt> @@ -3627,7 +3637,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-11-23 11:08:56 UTC +Last updated 2009-11-24 10:53:35 UTC </div> </div> </body>
